From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Wed, 29 Mar 2023 00:42:53 +0000 (-0500)
Subject: wayland: Don't crash without xdg_activation_v1
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2^2~20^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d8190aae3ff2f0a63a8fb72922fb117b5ab34b6a;p=gtk%2B3.0.git

wayland: Don't crash without xdg_activation_v1

This backports 3cdb6392102079d85ea38fa24d58c1824fe4dd37 to GTK 3.

See: #5701
---

diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 619f7982cb..9c0264e71b 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -4179,7 +4179,7 @@ gdk_wayland_window_set_startup_id (GdkWindow   *window,
     }
 
 #ifdef HAVE_XDG_ACTIVATION
-  if (startup_id)
+  if (display_wayland->xdg_activation && startup_id)
     {
       xdg_activation_v1_activate (display_wayland->xdg_activation,
                                   startup_id,